WIP: Remove cyclic dependencies in Model layer