Updated namespaces, 5.4 web server support