added new factories
try to resolve conflicts