More adjustemnts to new plugins interface