Demo code adjusted to library structure changes