refactoring
added Content related classes