Added subspecs for the rest of the classes.