Updated Composer and TODO list