Updated model & spec annotations.