Refactor for foundation of interactive criteria generation