Updated with composer