Edited DB structure a little bit