Added better uid system