Fixed depenencies and using(db_alias)