updated to add handle service