Refactor specs to accommodate dynamic resources