Extensions of CASH+ thermodynamic solid solution model for the uptake of alkali metals and alkaline earth metals in C-S-H