Manual fix of merge conflicts - models are added to the main-layout branch, because they are needed for the implementation