First part of refactor to clean up Operations metadata