Removed Container static class and added a default instance