Backend refractoring