Shouldn't we use the typedef here?