Changed plugin ArrayList to HashMap