Structure change & small fixes