Added numgen and duratiform