Property level annotations refinement