databases changes + refactor
--repository