Added visitor and mapping conventions.