Optimize pull/push