Prepared for Java 1.6, WIP