more changes to mockma for service api