added compatibility with service