Split master container and refactored