Update schemas

Schema updates and related spec updates