Added some classes & adapters