Simplified for rebuild