Improved basic controller support