Adding other non-Foundation components back in