Some work on the armor registry