PIM-3131: Add more specs