Added configuration to show/hide features

Change-Id: Ia21b70bddb9a5cb206805c40d640b549e705c100