Moved all functionals to base namespace