Changes from Pivotal's standard