updated Schema and defaults