Added support for live reloading