Reduced code duplications