Add changes in composer and models