Got rid of return  in entities' setters