Feature/relate dashboard fields