Updated basic structure