Feature/new feature metadata