Include support of /store/group + minor fixes