Role module + Update rules fixes.