Removed dependency on LoDash