fix architecture and improve DB manager