Adding some API classes