Added Rest generation