Updated properties system
Improved handler path definition