Added hub and remote control support