worked on db architecture change and comments