Updated c3 helpers