Update to new data model and add image size parameters