Add correct indicator definitions