Updated to use Extra Properties Extension

The dynamic properties way is deprecated, this is the new way :-)