Should be somewhere in the game roadmap.
I think the two formats you mentioned are the ones in the game now yes.