Refactor: move similiar to model layer