schema now uses correct types