Added the firsts functionalities to demo