Add new stuffs for adjust class and DB