Add consistent wrapper class.