Updated some classes for new Drawable