Handle builtins
Template modification support.
Javadoc updates