Implemented new structure