Prep for 3rd party resource externalization :cat: