PAHMA-1013: add two new handlers, remove 1