Added drawing framework