Support for exp name resolution. Bug fix API fields enforcement.