Maintenance update

Maintenance update to bring the plugin up to speed with the latest .NET framework. Also a slight rewrite to make expansion easier going forward.

N.B. Some property names may have changed.