Changes to fix App Key to constant