Improve plugins support by creating a better map implementation :)