Move ModelExtension to ObjectExtension