Refined the structure