Added some features TODO