Updates for d7base