Refactor, add store page support