adding relationships and rest of tables