Added in the rest of subclasses

Added in the rest of subclasses