Added an expression Map for reusing joined types