Update demo to not depend on package-private access