Rework configuration.

Change-Id: Ibde1a13be9b82245d58b69f24d6477b90f30611d