Added helper classes for testing / populating