Refactor. Implement RoshiSet