I vote for 1, because changing this to File makes it much less useful and changes the logic going forward how messages are received and processed.