Modify constants to methods