Feature/faker refactoring