Final feature adding