Add init tablespace size and avoid duplication of plans