Add first set of custom elements and the optional<> definition.