Updated Op classes, fix value format