#6 added userId to serviceOrder and Enum userRoles