Updated pantheon support