Additional Settings

Change-Id: Ideb4d26c3c6c59d7c8742a1a3ae2b49c5df7f9bf