Added missing structures