Changed Factory from Role to Class.