Refactor property management
Merge branch 'master' of github.com:taskphp/task