Create product fixes

Can we move all properties below into object's definition?