Feature/one instance per value

Feature tested, develop ready for changes