added store extensions
improved some bits of the adapter