Adding namespace guards