Small refactor STUDIO-4208