Added defgen