Rename store as choice store for clarity
Support top level addChoice method
Preloaded choice rendering and addition