Added support for base instance + draw optimizations