Move to proto