Added support for new www