Fixed map function & graph based plugin loading