Introducted content handler
Introduced the content handler and minor bug fixes