Please add controller support please!