added adaptor classes