Prepare the tables along with commit 185098874ccb08e1e210d08dfc86b09bd30e900a
Closes #3