Added factories and moved lamp post addition to a separate method