Added Window, Drawable, and DrawCanvas