Updated the base class and hopefully fixed the Composer file...