Updated SQL draft