Finishing up GenericModel