Liberals set to table bill to remodel national security measures