These should be in separate plugins IMO.