added generator handler