updated add handlers to PM fields