Removed direct dependency on Model, so we can use standard HOAS tricks