added ContentInitializer and made some refactoring