updated Schema and Spec