Made info dictionary logic more modular