Downgraded to java 1.6 and replaced Map with interface with HashMap implementation