Java 6 fix 2
Added methods to some ENUM-s