[ORB-327] - completed auto generate functionality