Adding few more schema changes