Updated Architecture to include loans