Use correct types