Update for namespacing and composer