Added and tested class wrappers for backwards compatibility.