Reworking options handling and default settings to be more flexible