Adding the updated structures in common.h