Fixed issue #1 - master-child tables

Split single table stuff into a master child scheme