Fix return type annotation of mappedProperties