Added some type helpers