Move factory addition to roleDao