Update access information on successful query
Update TODO comments
Merge branch 'access_update'