Added fields to DrawableModel