Added auto-reload feature