Base management (12/21)

Base management