Various updates to the feature set