Better path/group handling.