Improved options handling
Add supports for make jobs