Updated for drawables