Bug fix: Some collectiosn were not initialized properly