slight update to adapter/plugin pattern