Refactor out dynamic definitions