Replaced string const with defines