Imported adapters from the previous version, updated them and cleaned them up a bit.