Base management (20/21)

Base management