Update 5.1

Starting to implement jobs into EntityController