Add Constant support, rename all prints into log messages