Added Type flag