Added orders table and fixed associations