Updated using faker