Reorganize types acid types