changes for generic controller support