Updated for composer