Migrated Drawing to unified api

Changes in previous commit