Several changes in Base an PushDown