Added parsing for class types.