Improve anonymous_index design