- added surcharge configuration
- fixed invalid table names
- refeactored plugin structure