Changed, but still think we need to get ride of this thing from repository, as it's mixing behavior and this should be only in managers not repositories...