Added ifndef support