Removed lodash dependency