Rid of global struct