Added NS checking
className fix: If namespace is not set then ClassName will be cut of