Add more auto-collected information, improve loading API from file