Updated with a few more helpers