Added extensible Schema and fixed extensible types