Minor improvements in Resolvers, db structure is subject to changes