Make activity_type public again
Add worker loop methods