Task 7 with db & map