Changed to the new plugin structure. Here we go