PIM-2124: Add deprecated tag