Merging API classes to work with the new code