refactor Slocator/Containers/ContainerContract