Fix the Paper_trail issue using the new namespace