Completed model adaption of existing classes