Adding Composer types

- New types for the clients
Updating usages of the composer