WIP Database requests optimisation #1