Integrated some cairo draw routines