Added key streching capability