Update on the Java and Android templates