[WIP] Updated composer.json & api factory