Removed dependency on subpathauto