WIP Updated database interaction when performing operations