Remove direct including from composer and add to method