CONN-1034: Changed from accessor to field annotations