Move some static constrants to Util