Added factory suppport