Update Factory structure