Fixed bugs - hardcoded references to Demo data