Readded controller support