Parliament House North and South Block to be retained