Added singleton rule features to setup_rules