changing uniform class structure