added configuration enhancement and test