Changing to Option Pattern && Included Secure Social