Changes on Drawable class