Re-added options helper