Removed need for separate adaptor files - default adaptors now hardcoded.