Added FindEntityType/FindComplexType methods to schema. Bug fixes.