Added support for local hosting