Updated structure properly