Updated to meet new plugin criteria