Library and Demo project changes