Changed database design - filename contains id, uid, & rid