Imported new case block
Fixed colliding namespace declaration