Revert to Proto
Move to use static functions