Rebuild will structure simplification