Added contenthandler for classource