Final version! Added const strings and values