Improve factories