Added add_optional_features to . Should be helpful.