Renamed pictureId to currentPictureId