Added canvas support