Fix merge errors
Added InputDataResolution and InputDataValidation proper
Initial JobScheduling mofication