Making source java 1.5 compatible