Eliminated values package. Using injector instead of values.