Improve get_info