Added address and state table with associations