Fixed dependency versions
Made groups common resolve names