Added ability to choose correct structure