Added a couple of features to facilitate lower-level communication