Add PictureOptions to the configuration model

Change-Id: Ic7f763ab46e4468d5fd5894ef8080e550dd97f4d