Refactoring to use Gee and its' job setup