Better support for inline actions