An Extended Group Additivity Method for Polycyclic Thermochemistry Estimation