Updated entites and DB structure