First step towards store size limit