Updated schema and updated the infra directory for the same;