Better approach to containers