Using the correct types now