Fixed: Database tables generation