Add features integration

Add features integration using features API