Better controller namespace support