Updated code to use extension methods instead of custom classes.
Changed code base to use extension methods instead of custom bespoke classes.