replaced collections of permissions with a more optimized EnumSet of
permissions
optimizations
added service types and service lines