Improve arg validation and 2nd arg can now be an array
Remove ability to have an array for a key