Updated handling 1.1 spec (wip)