new package and adapter classes