Added more support methods in service