Completed service and integrated API more fully