I just remarked that you use now guava for collection instantiating. I'll then revisit my code and will do so.