Added generator, got rid of setters.