Common config changes
Added partial caching
Renamed events