Changed to single namespace