Removed underscore dependency since we have lodash already