Made independent of the keys API