Refactored Containers to Worlds