Added new models
Fix swagger issues with complex objects