Added some expert features