implemented required changes after rs-trivia-tools introduction