Updated operation switch implementation