Extended classes, init/cleanup added.