Namespace/Class/constructor corrections
Version