Fixed circular dependency
Adopted docs to deferred model pattern