TA: DB access organized better