Added context to draw methods