Working on the two db layers