Added Drawable class
Changed from template system