adopted models according to the changes made by Uwe