Minor fix and link controllers to controller implementation