Add models, stores and views for #388, #390