Added uniform handling