Moving authenticated related models to its place