Legacy refact