Fixed unwrap pings on parsers and correct types on classes