Updated to reflect new constructor and key specification