Add more docs from Paolo and Tony