Fix composer and inheritance