Ejhernandez/fix audit compose types 32