Add functions to access via uids, mercilessly refactor function names