Enhanced doc