Fixed - User table: address references added