Added compilation switch