Add migrations and adjust options for SP-334