Made more Java8 compatible