Added capabilities, tests, and helper functions.
API updates