Content type enhancements and some refactoring
Further improvement of content types and general