Switched to modelserializer and references to foreign objects