Working on DB part + test tool