- Added underscore as valid service name