Move to not using the options key