add store views and lot sof changes