Added Contact and Contact Address tables