Added more functionality for the ContentManager