Many changes for Info Controller