Updated job form, added new entity fields