Add basic feature parsing