updated service mapper and entity functions