An Extended Macro-Finance Model with Financial Factors