Adding role deps to v2 Role class and fixing some bugs