Added complete list of values, removed underscore dependency from templates