Adding structure
Fixing structure