refactor work
using Dynamic Property refactor