Added list and map decoding and cleanup