Changes to module files to reduce db calls.