#42: refactored SetId