Update to use common Vigor resources where possible