Working on the Demo adapter