initial version
refactoring for new aws-plugin version