Replace demo constants with Properties