Adding more complex keyed support