Move constants into proto
Better text