Reflect API changes
Moving drawing functions back into core