Added internal key, removed old code