changed regex for broader compatibility with service definitions