Additional classes for supporting haiku