Aligned the spring part to latest modifications