Updated composer.json, fixed dependencies