Annotations added. Minor changes to reflect the new schema