added functionality - I don't like the Id/Key duality too much