Changed the type of UIDs to be more certain