Added standalone mode check