Refactoring ContentManager