Updates to conform to more spec