New constants and template mode.
More classes added