Merging new model design from EOxServer Master