Made street generation more modular.