Added new feature for v3