Controller additions