Use better dictionary syntax in schema file