Performance tweaks #2 & Namespace changes