Make plugin work for our needs