Update structure
Merged changes from stc-1000+