Added more logging and demo generation