Updated concat namespaces and fixed to psr2