Implements factory for container and fixes used sites for containsStatus() search function