Add Support for java 1.8. Collection has been modified.