No empty group keys + updated deps