#99 - backwards compatibility with backend