FIX Concerns found in the PR: prefixes for the new operations