A few more changes on feature & operation definitions