Add syntactic sugar and javadoc comments