Constants class moved to Util package