Better doc support