updated service and model