Fix caps and add lodash