Made a few updates to the Helper