Core: Improved Update
Plugin: Add OSMEngine