Added organization fields to user and loans