Fixed removeOnTermination and persistanceMapping value assigned problem