Bug fixes + Added Job Controller and Model