Updated composer.json + others