Adding some clienty things