Changes for Schema designer