Added some extension methods