Feature/resolve citations