Updated to work with new derived operations code