Added controller dynamic handling