Refactor database ( Job entity)