Introduce java 1.5 support