Refactor - Use CreateEmptyInstance