Added more configuration options

Change-Id: I6f8e91418f200786b7a71ab5ac3739d9fa4ebf9c