Added a couple more helpers