Update to include all interfaces

Allows for gesture and advanced use scenerios