Correcting scope.
Adding compatibility to drawing data.