Extracted more mall stuff
Fixing mall namespace