Added key holding support