updated schema to support complex types