Expand capability of oregen again