Add features (25/26)

Add features