added explicit annotation field names where appropriate