Refactored container registration