add more java 8 magic