Improved Models
Mock-API, Connected Model