Some change to work without ROOT