Add Help and option handling