Add basic controller support