Implemented more structural enhancments