#26 temporary fix for some core classes. Only four classes added to list of annotated for now