Fix bad ordering causing nil ref error
Use new common.New() everywhere