[ADDED] Updated base structure