Container refactor