Add world-object envelope support