[OTF:1619] Updated Edmx model with required schema tables