Configuration changes

Signed-off-by: Daisuke Mochizuki <mochizuki78@gmail.com>