Added a proper lens dependency, rather than continuing to dance around
it