Tidied up Adapter classes