Add and clean some features