Some updates and changed  namespace.