Add speed improvement to table creation