Restructuring + virtual overrides
Merge pull request #354 from bastih/feature/restructure_table

Restructuring + virtual overrides