-- Modifications to resolve notices while importing job