Added whitelist for storing options in attributes