#4 Support for custom actions