Modify job property to enum
Add new query api