refactor db linked app with current changes