Moved ContentParser functional into CContent class