Add more type decoding