Updated internal framework to use own namespace