Use java7 where possible