Added @UtilityClass annotation and javac handler