updated table scheme (draft)