Added a few classes to start API creation