Make declarative layer match migrations