Updated the definitions and the spec