Improved Base Management