Updated to new namespace