Merged with factory library