Jinzhan

Results 2 issues of Jinzhan

Using `Property` instead of `TwoDProperty | ThreeDProperty`, because some of the latter's properties types are `nerver`.