Fixed issues with new schema for version 1.1.