Refactors and extends Drawing base class