Generator improvements