Fixed strucuture issues