Update according to draft 0.1