Aligned for new plugin