Added support for localhost testing