Added some more cast functionality