Added some more helpers.