Added some more indicators