More comments for client code