Adapted to new stores version