Protocol improvments