Change to java 8 Optional