Removed lodash dependency (not needed atm)