Role Factory modified