More changes to follow specs