Working on DB integration