Added new tables and made it more portable