This is a very minor thing but this could be Collections.emptyMap(); Maybe you could fix that in some later update.