revamped repositories to mapper
removed factories --> should be done inside mappers