Other schema changes for RD but with build fail