Add migrations + controller fixes