Make master controller dynamic