Made drawables more flexible