IDB-009 Added a new feature