Add support for user-defined actions; (and remove the test of a deprecated action)