Added feature and activitiy extractiion