Replacing the property implementation with the proper-d package.
Using render where possible.