Proper handling of annotation fields