Added break + moved plugins