Added ResolvingProperties decorator