Add standalone mode