Reduced the amount of lookups for retrieving options.