Added two more trivial classes