Complete the structure definations