make feature helper more generic