PLINK-130 refactored @MappedAttribute into two separate annotations