First part of refactor to clean up operations metadata