#46 Feature/2.0 delegation