Add new feature and test cases