Added John's datasources and actions