Updated PresentationModelBySubclass without AspectJ to match the latest update.