Added organization fields to user and loan