Modified to add plugin