Added a few utils