Added some more SPV support