Job Module and Issues Fixes