Shifted delegation to separate file