Use indexing instead of get_mut since it now returns an Option