Imported additional classes; changed disposal pattern