Added 1.5 type
Reverted 1.5 changess for older generators