Custom modules for Osha project (non feature-revert)