Updated to latest spec