added class checking
removed dependance on the thesis_asset_handler