More changes to domain module.
Continue removing dbms use