Update to use class for path definition