Fixed schema accdg to new requirements