Refactored more elements into shared modules for DataModel helper modules.