Replaced step with keys and collect