Moved options route callbacks to controller