Rework auto reloading to work across build session and be more reliable