Get rid of faker dependancy