Modify for dynamic demos like EAP and Datagrid