Factory improvements