Adaptions for demo-system