Fixes #9 : Modify the function for add misc features