Add proto-based OOS