Add namespaces
Update for composer changes