Made types consistent