Add host specific option support