Convention build and caching
Simplified convention API
Map statements ordering updates