Added factories, removed value