Update utilities and attach source, javadoc