Further work on Controller integration