Added new namespace solution as per org