Added support for draws