Changed factory builder
Prepare release