almost eliminated values package - two classes left. Use injector instead of values