Move more stuff to suppliers plugin