Update utils.hpp and types.hpp