Fix tables creating for shcemes