Update to rule all updates. group support and clean up