Class constants and Regex added