Ongoing ease of use work.

Add a CustomDataSource to easily add entities programmatically.
Also sort requires.