Added a couple utilities