Updating some util methods that need to be static