Use Optional as JDK 8 supports us