Added some features needed to implement RFC3156