updated service structure