repush common tools with new struct