Updated base structure