Fixed an issue with Entry not being defined as Map.Entry