Add store and rearrange some elements
Add tenant field's constant