some changes to db components