Add nulls and garbage collectors for keys and step data