Refactored the container related mixins